edited backbone
removed file
conflicts resolved