resolved merge errors in IDE.  About to test.
Encountered some errors: imgvault is not working properly as external directory for images.  member login page is also giving an error that I cannot decipher.