major style revamp
conflict resolved