CSS Merge conflicts riing