current war style
conflict fix
conflict fix
Merge remote-tracking branch 'upstream/master'