No conflict with hg-change