Resolve conflicts with page names