fix pushingi
fix merge conflicts