turn time difference to minutes
merge conflict boo