Error in conflict merge from 3.0.57