removing license
fix some pages
fix conflict