Fixed Merge oddities

F
Fixed Merge oddities