Tried to add line 10 locally and discovered a line 10 already existed! So I've resolved then ensuing conflict and used line 12 instead