removing some conflict marker