fix previous error in reconciling merge conflict