resolving conflicts

fixing merge conflicts