Base Css Conflict Merged