redundant merge commit