fixed error in merge, added test scenarios
version bump