removed conflict marker