made migration files
fix merge errors
fix spec helper