fixing commit conflicts

fixing commit conflicts