Resolving conflicts hackily