removed some weird conflict fragments