Stupid Git and its merge...