Fixed more merge conflicts :)