Dependency branch merge hell