Fix duration calculation
edit conflict
edit conflict