fixed width merging conflict in #container