Try to fix merge conflics.