Merged differences into a single codebase