Resolve Conflict Version