Taking out another Git merge comment