minor merge update