add facebook functionality
resolve conflicts