fixed the stupid merge code