Merge pull request #1190 from will-moore/delete_chgrp_MIF_bugs_May20th

Delete chgrp mif bugs may20th
Show Activities panel with new errors
Fix merge conflict resolution bugs