Conflict marker deleted - mea culpa