How to Fix Canonical issue without dropping present work?