Removing conflict marker