Init push
Fix confict