Fixed merge code