Problem in node after git merge how can i solve it please?

[ilhamaa]