Fix those merge conflicts and everything