I\'m having an issue with merging in git. I\'m no git expert. I have two branches feature_branch and develop. Develop being a public branch. I have made some changes in feat
