still fixing merges and updating git ignore