merge previous changes