Resolving conflicts

asdf