resolved conflicts

resolved conflicts