Fixed merge bug (need deep merge)