Fix conflict with dependency