Logger Update
Conflict fixes