normal page working
manual merge