resolve conflict of '6-ATS' (#9)