Fixed an error with last merge. Why is git merging so difficult?