test resolution
Merge branch 'Romain'