resolve merge conflict
facebook sdk