Pulled the changes on git as there is pushed enhancement applied to the whole web application, as per pulling, a conflict is encountered, merge and checked all the changes and applied the changes from git as well as my changes in my local, after the merging, pulled the changes again, and my local is up to date, tested my changes and when confirmed that is ok, pushed my changes.