Fixing merge conflict detrita Galia identified.