fix feature conflicts