fixed even more merge conflicts, hated git