last version with conflict