fixed conflict in devise migration