resolved conflicts by removing the test report