fixing conflicts

delete chat while deleting a friend