Resolved conflicts in admin