Fix name of the conflicted extension