- resolved conflicts with other features and added dependencies