updated to latest version of cassandra
cassandra merge continued