Git merge left <<<<<, removed