merge recent changes