parse+facebook
merge fix