small fixes
resolved conflicts