Fixed some stupid merge conflicts