update version of rope require
fix conflicts