save changes
save merge
add modernizr for test