booking display in admin
conflict resolved. and merged
booking view