merging in changes from external project