devise
schema conflict resolve