new state transition
merging the concflict