more conflict testing
Merge remote-tracking branch 'origin/master' into Chris