Add new rule element
fix merge conflict