fix issue during merge conflict