Replaced some garbage from the conflict