barDetails with Id
Merge conflict resolved