fixing merge marks