Fix weird merge