Merges in Git still elude me...