readying for merge