r2_contacts
bug fix
merge resolve
merge solve 2