Fix conflicts info in booking details page
Post-WIP fixes
Fix circular import
Remove unnecessary backslashes
Fix missed rename