Fixing conflicts
fixing merge conflicts
Merge remote-tracking branch 'upstream/master'