added suggetion checkbox
update pages
conflic
rescue file