resolving conflicts

resolving conflicts