test conflict on no binary file
Signed-off-by: Pape <papesdiop@gmail.com>
Merge branch 'master' of https://github.com/era-project/era-indicators.git