Q9 Syncing conflict

Resolves conflict in Q9