Clean up differences between branches