Log and Log test class added
Conflict removed