Merge your code with confidence