Fixed Merge conflicts

merge problems fixed