fix responsive design for webkit
fix conflicts
update version