fixed more conflicts
Merge remote-tracking branch 'origin/master'

Conflicts: