Merge change with origin