working merge commit