Retrying commit because we dont know how to merge.