Fix https://its.cern.ch/jira/browse/ADAMATLAS-160 and https://its.cern.ch/jira/browse/ADAMATLAS-163 : late and fresh merges should work correctly now
Fix https://its.cern.ch/jira/browse/ADAMATLAS-160 and https://its.cern.ch/jira/browse/ADAMATLAS-163 : late and fresh merges should work correctly now