load page locig
fixed merge conflict