migrations dir ignore for make test
merge conflicts t1 fixed