edited security question and answer seed
resolved conflicts