removed conflicting styles
commit changes from master