Lots of clean up after tri-merge done