Removing the last of the conflicted lines!

Did not reconcile all the merger conflicts before the last commit.