Ticket #982: Updates must stay above story information, otherwise you can not click to see the comments
Fixing conflict