#9 - Facebook comment box: fix merge conflict