merge with infinity patch