Make log a service
Resolve conflicts with master