Fixed merge conflicts, and test files disappeared.