Creating transition state, and merging correctly the previous commit