Fixing partial merges and adding autogenerated files to gitignore

Fixed some unfinished merges, added some paths and files to gitignore and removed duplicate migrations in order to allow db to build.