some conflict text left in.  cleanup