Cleaning merge conflict