Changes in stayle
style cahnegs
conflict resolved