removed test keys
resolved conflicts