rename and push from local side.
update init push
added untrack file
fix conflict