devise
first conflict resolution