Allow Add on unmerged file
Fix crash after committing a 'rm'