final local merge