removed merge conflicts on css