Fixed merge bug

Done