test 3
resolved confli\ct