Oh, really? I think the story is that I will go ahead to follow the master path of your work and change it incrementally once I finish the c semantics to fit java backend. I mean it is hard for me to resolve conflicts and fix c semantics with respect to java backend at the same time. 

Do you want to remove your merging or do you want me to resolve the conflicts immediately?