resetting the style css of merge conflicts