solve merge conflict on admin_model