Merge with jose