Resolving the git conflict. 2/3