diff --git a/addons/process/process.py b/addons/process/process.py
index 89c543f795d..2f3648a86f3 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -246,12 +246,8 @@ class process_transition(osv.osv):
         'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'),
         'action_ids': fields.one2many('process.transition.action', 'transition_id', 'Buttons'),
         'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'),
-<<<<<<< TREE
-        'note': fields.text('Description', translate=True),
-=======
         'role_ids': fields.many2many('res.roles', 'process_transition_roles_rel', 'tid', 'rid', 'Roles'),
         'note': fields.text('Description', translate=True),
->>>>>>> MERGE-SOURCE
     }
 process_transition()
 
diff --git a/addons/process/process_demo.xml b/addons/process/process_demo.xml
index cc603d5b165..2388d60dac2 100644
--- a/addons/process/process_demo.xml
+++ b/addons/process/process_demo.xml
@@ -1,162 +1,5 @@
 <?xml version="1.0" ?>
 <openerp>
-<<<<<<< TREE
-
-
-    <data>
-
-        <record id="sales_workflow" model="process.process">
-            <field name="name">Sales Workflow</field>
-            <field name="note">Sales flow for services companies.</field>
-        </record>
-
-        <!-- Nodes -->
-
-        <record id="node_quotation" model="process.node">
-            <field name="name">Quotation</field>
-            <field name="note">Quotations are sale orders in draft mode</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'My Quotations')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states">object.state == 'draft'</field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_sale_order" model="process.node">
-            <field name="name">Sale Order</field>
-            <field name="note">Manages the delivery in invoicing process</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'All Sales Order')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states">object.state == 'manual'</field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_invoice_on_sale" model="process.node">
-            <field name="name">Invoice</field>
-            <field name="note">In case you invoiced on Sale Order</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Invoice')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Invoices')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_tasks" model="process.node">
-            <field name="name">Tasks</field>
-            <field name="note">In case you sale services on order</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Task')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'All Tasks')]"></field>
-            <field name="kind">subflow</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_packing" model="process.node">
-            <field name="name">Packing List</field>
-            <field name="note">The workers pack the requested items</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Packing list')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Packings to Process')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_delivery_order" model="process.node">
-            <field name="name">Delivery Order</field>
-            <field name="note">The transporter take the box and deliver it</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Stock Move')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Waiting Delivery Orders')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>  
-
-        <record id="node_invoice_on_delivery" model="process.node">
-            <field name="name">Invoice</field>
-            <field name="note">In case you invoice based on deliveries</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Invoice')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Invoices')]"></field>
-            <field name="kind">subflow</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>  
-
-        <!-- Node conditions (Gray nodes) -->
-
-        <record id="node_condition_invoice_on_order" model="process.condition">
-            <field name="name">Invoice on order</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
-            <field name="model_states">object.order_policy != 'postpaid'</field>
-            <field name="node_id" ref="node_invoice_on_sale"/>
-        </record>
-
-        <record id="node_condition_invoice_on_delivery" model="process.condition">
-            <field name="name">Invoice on delivery</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
-            <field name="model_states">object.order_policy == 'postpaid'</field>
-            <field name="node_id" ref="node_invoice_on_delivery"/>
-        </record>
-
-        <!-- Transitions -->
-
-        <record id="transition_confirm_quotation" model="process.transition">
-            <field name="name">Confirm Quotation</field>
-            <field name="source_node_id" ref="node_quotation"></field>
-            <field name="target_node_id" ref="node_sale_order"></field>
-        </record>
-
-        <record id="transition_packing" model="process.transition">
-            <field name="name">Packing</field>
-            <field name="source_node_id" ref="node_sale_order"></field>
-            <field name="target_node_id" ref="node_packing"></field>
-        </record>
-
-        <record id="transition_invoce_on_sale" model="process.transition">
-            <field name="name">Invoice on order</field>
-            <field name="source_node_id" ref="node_sale_order"></field>
-            <field name="target_node_id" ref="node_invoice_on_sale"></field>
-        </record>
-
-        <record id="transition_traks" model="process.transition">
-            <field name="name">Create Tasks</field>
-            <field name="source_node_id" ref="node_sale_order"></field>
-            <field name="target_node_id" ref="node_tasks"></field>
-        </record>
-
-        <record id="transition_delivery" model="process.transition">
-            <field name="name">Deliver Goods</field>
-            <field name="source_node_id" ref="node_packing"></field>
-            <field name="target_node_id" ref="node_delivery_order"></field>
-        </record>
-
-        <record id="transition_invoice_on_delivery" model="process.transition">
-            <field name="name">Invoice or delivery</field>
-            <field name="source_node_id" ref="node_delivery_order"></field>
-            <field name="target_node_id" ref="node_invoice_on_delivery"></field>
-        </record>
-
-        <!-- TODO: Transition actions (Buttons) -->
-
-        <record id="action_confirm_quotation" model="process.transition.action">
-            <field name="name">Confirm</field>
-            <field name="state">workflow</field>
-            <field name="action">order_confirm</field>
-            <field name="transition_id" ref="transition_confirm_quotation"/>
-        </record>
-
-        <record id="action_cancel_quotation" model="process.transition.action">
-            <field name="name">Cancel</field>
-            <field name="state">workflow</field>
-            <field name="action">cancel</field>
-            <field name="transition_id" ref="transition_confirm_quotation"/>
-        </record>
-
-        <!-- TODO: Transition roles (workflow transition ids) -->
-
-    </data>
-
-=======
 
 
     <data>
@@ -312,5 +155,4 @@
 
     </data>
 
->>>>>>> MERGE-SOURCE
 </openerp>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index c4deb35994c..d5ae44a2a55 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -128,115 +128,6 @@
         action="action_process_form"
         parent="menu_process"/>
 
-<<<<<<< TREE
-    <!-- Nodes -->
-    <record model="ir.ui.view" id="view_process_node_tree">
-        <field name="name">process.node.tree</field>
-        <field name="model">process.node</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Process Nodes">
-                <field name="name"/>      
-                <field name="process_id" select="1"/>          
-                <field name="model_id" select="1"/>
-                <field name="kind" select="1"/>
-                <field name="flow_start"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_process_node_form">
-        <field name="name">process.node.form</field>
-        <field name="model">process.node</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Process Node">
-                <group colspan="4" string="Details">
-                    <field name="name" select="1"/>
-                    <field name="flow_start"/>                                    
-                    <field name="process_id"/>
-                    <newline/>                                    
-                    <field name="model_id" select="1"/>
-                    <field name="menu_id" select="2"/>                                    
-                    <newline/>
-                    <field name="kind" select="1"/>
-                    <field name="model_states"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="Outgoing Transitions">
-                        <field name="transition_out" colspan="4" nolabel="1">
-                            <tree string="Transitions">
-                                <field name="name"/>
-                                <field name="target_node_id"/>
-                            </tree>
-                            <form string="Transition">
-                                <group colspan="4" string="Details">
-                                    <field name="name"/>
-                                    <newline/>
-                                    <field name="target_node_id"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Buttons">
-                                        <field name="action_ids" colspan="4" nolabel="1">
-                                            <tree string="Actions">
-                                                <field name="name"/>
-                                                <field name="state"/>
-                                                <field name="action"/>
-                                            </tree>
-                                            <form string="Actions">
-                                                <field name="name" colspan="4"/>
-                                                <newline/>
-                                                <field name="state"/>
-                                                <field name="action"/>
-                                            </form>               
-                                        </field>
-                                    </page>
-                                    <page string="Roles Required">
-                                        <field name="transition_ids" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Extra Information">
-                                        <field name="note" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Conditions">
-                        <field name="condition_ids" nolabel="1" colspan="4">
-                            <tree string="Conditions">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <field name="model_states"/>
-                            </tree>
-                            <form string="Condition">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <newline/>
-                                <field name="model_states" colspan="4"/>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Extra Information">
-                        <field name="note" nolabel="1" colspan="4"/>
-                    </page>
-                </notebook>
-            </form>                                
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_process_node_form">
-        <field name="name">Process Nodes</field>
-        <field name="res_model">process.node</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-    <menuitem
-        id="menu_process_node_form"
-        action="action_process_node_form"
-        parent="menu_process"/>
-
-=======
     <!-- Nodes -->
     <record model="ir.ui.view" id="view_process_node_tree">
         <field name="name">process.node.tree</field>
@@ -348,7 +239,6 @@
         action="action_process_node_form"
         parent="menu_process"/>
 
->>>>>>> MERGE-SOURCE
     <!-- Transitions -->
 
     <record model="ir.ui.view" id="view_process_transition_tree">