r2_contact uj sor
merge conflict solved