bug fixes
bug fixes and coflicts resolved