bug fixes
resolved conflicts