fixed stupid merge problems