basic_test_config conflict resolution
farkle pt. 1