Removed the git conflict stuff.  Oops.