Resolving conflicts first, details of this commit displayed in the subsequent commit