fixing errors with not cpp11
merge
minor edit
fixing errors