times test and requests
resolve conflicts