Finished RawPokemonDB and fixed its conflicts :)