Remove logs
Resolve conflicts