Add pix
Fix merge