getting ready for merge