Git View Merge Conflicts