harmonising progress tests
clean conflict