Clean up cassandra merge action better