finished fb share process
fix conflict