remove merge conflict from config.ru