Room - resolved conflicts