fixed merge comflict
deleted duplicate user migration. deleted one was from clearance gem