Resolving conflicts

Binary files differ.