Added merchant repair feature