stupid shit
adds migrations and deletes user model
fixes mergeconflict