excluede nbactions.xml
untrack nbactions.xml
fix: final merge never executed