Updated conflict resolve() method and added conflict commit() method
Updated conflict resolve() method and added conflict commit() method

gitana/gitana-javascript-driver,gitana/gitana-javascript-driver,gitana/gitana-javascript-driver