conflict bug fix
Merge remote-tracking branch 'tennis/master'