merge from singlepage