merge current changes