Fixed obvious merge conflicts