fixed stupid merge error