Revert conflicting files.

Branch is now a combo of the conflicting branches, with the conflicting
files reverted to before there was a conflict.