Resolving the git conflict. 3/3