Fixed merge code broken