Conflict resolving commit v2.