Improve merge behavior

prevent empty commits by checking if index is dirty