some fixes
fix conflict in main