on progress
merged
fixing git error
fixed conflict
removed all migration to start from first
added new migration