comit for pages
fixed paths
fixed paths
fixed conflicts