Added solution
Updated log
Fixed conflicts