version bump
fixed conflicts