saving some changes to the test
resolving conflict
resolving futher conflicts
final conflict resolution
created the biodata module