merge with latest code