Merge archer (4/18)

Merge archer