Bad merge or something?