fix blocking div bug
fix merge conflict