Details.fix.v2

Fixed merge conflicts