Stupid merge artifact