all seems done
non-admin cannot merge
another try
Finalizing first part of home work