update devise
resolve conflict