Fixed potential css conflict
Merge Master