fix merge conflict issue