Add testing solution. Add knight
resolve conflict