Add new merge conflict test (UA)