Cleaned up a bunch of minor merge  conflicts, always deleting
<<<<HEAD
 in favor of
 >>>>feature/Manual_Mode_rework