Update actions.js

use this.dummy.conflicter.resolve(function(){}); on creation of our xml files. to resolves file(s) conflicts