Add package Fileconflict + code coverage improvement