[mapper] purchase cycle
[conflict] fixed