rechange version casperjs
resolve git conflict
resolve git conflict