merge locally