removed stupid merge code