I had make fully Git history in my repo , I don't want to conflict resolution again. If some one interested just turn to my repo and check commit history.