fixed stupid merge thing