merge with the previous changes