CSS Conflict issue solved