fixed conflicts

conflicts in avalon.less & index.html