Thought this conflict was fixed already