resolved merge conflicts in editor template; added first unit test for username validation