Logger added
Conflicts resolved