git fucked up the merging...