consolidating differences between master and work branches