Removed conflict marker