Resolved features conflicts