Fix syntax and merge differences