devise
resolve conflict