Merge local branch into tizen