Lidquid conflict Fix