update head
resolve merge