resolved conflicts between features and added shared settings feature