Fail resolving conflict. Another try...