Take out merge conflicts