resolve conflicts

4 jobs for haaggarw-update-headers in 4 minutes and 29 seconds (queued for 1 second)
latest