Removed half of the reduce/reduce conflicts
Merge remote-tracking branch 'origin/master'