zprezto fixes and merges