Fixing merge conflict ats.c