minor fixes
Merge and conflict solved