fix error during fixing of merge conflict