Added test field to Member.
Log message added
Macho added
conflict test
Fixed numero 3
conflict test 2