Merge in work that was done on the other branch