merge fb changes