Unmerged files now show as unstaged changes