working on talk time
resolve merge