solving conflicts
solving conflicts
new temporal directory as parameter
cleaning the branch