add offense action relationship
resolve merge conflict