added measurement happened_at
resolved conflicts