resolving more conflicts
Merge branch 'master' into marty