Fixed margin conflicts for history