cherry pick the good commits for log filtering
Fix the goddamn conflicts