fixed stupid merge shit