add check_race test
remove CONFLICT_DEBUG option in resolver

was not a good way to debug the problem
remove old file + update some text
fix setup.py
fix double newline in "kdb file"
mount augeas script