Resolving conflict error