another merging
added editing user test