fixed stupid merge conflicts