added something to rules page
Fixed merge conflict