transition and new data in place, along with some mappings
resolve conflict