Fixed Changes with Merge

Merge did weird things, made them go away.