Started on postit
resolving mergeing conflicts