Last generated version after resolution of conflict