merge erics fix