Add more logs for bug finding
Resolve merge conflict