Add backbone
fix merge conflicts