YankStack conflict with Surround fixed