add joy count feature
fix conflicts