fix south rules
merge conflict