Fixed ruleset
Fixed merge conflicts