manually fix merge conflict and comment out smart invite UI