fix merge conflict, remove duplicate map entry