fix merge source conflicts