added separate settings file, resolved conflicts