Please train me on git
Resolve git conflict in new method