Remove committed conflict in SB Social

This removes a conflict that made its way into SB Social in the 4.5 release.