merge previous version