fix string formatting issue on save
cleanup before pull
fix merge conflict