backbone started
conflicts resolved