Remove Fee Sheet Merge Conflict Marker