Separated persistence logic from model and resolved conflicts