remove fixed, fixed follow many
Merge remote-tracking branch 'origin/cassandra' into cassandra