min conflict added + some test result added to repo