edited page mechanism
resolved conflicts