Roadmap merge