fix merge conflicts
fix conflicts and remove purecss