add uncommitted files after merge