Added mass updates option
Conflict solving in admin content