wr3 page changes
database.sql conflict resolved