modified locally
merger locally