merged conflicts in models