adding a comment to go over git flow
fixed conflicts and removed comment