QS Conflict Fix