merge conflicts ready for beta