Merge ponypack update