Can I still use Canada Post module after upgrading to 1.5.5b?
I tried to merge the files manually and everything was simple until I reached

canada_post_shipping_module_1_5_3/admin/includes/modules/copy_to_confirm.php

where there is a merge conflict at line## 86-86 of the vanilla 1.5.5b.