fixed conflict between Scott's branch and dev