getting ready for major merges