worked on linking the transition
conflict solved