roxy gen doc after merge conflicts