Resolving the git conflict. 1/3