Merge archer (9/18)

Merge archer