Try to fix some merge conflics.