Merge with flyzsh