Remove git conflict-marked areas

This simply removes the merge conflict-marked areas and sets the code to use the 2.3 branches merged changes.