conflict resolution
Merge remote-tracking branch 'upstream/master'