chore(logging): Add more logging to conflict detection code