resolve conflict
version bump