new merge
Test users
Resolve merge
Resolve merge conflict