Merge with local brancj