use gitp-push
rebase instead of merge on gitu-update
update recursively
fix conflict