conflicts gnucash2 y
