editted styles on master
style and master conflict fixes