Merge commit for conflicts of previous commit