Fixed conflicts (GOD THEY'RE ANNOYING)