Fix bug failing to merge when selecting the right side
Merge remote-tracking branch 'gcheung/master'