change stable version for spree 2.1 to 1.1.1
resolve conflict in Versionfile