merge with local ist
merge
fix small issues