fixing wrong local merge