local merge test
fixed local merge