merge with newer updates