merged inconsistent changes on target and host