ATQC fixed
Conflict resolved