fix remove condition file
Merge branch 'newissue' into develop