Removed extra pages
Fixed conflicts