working on getting the facebook sdk working
fix conflict