git prompt branch feature added
Just syncing changes....
Merge and conflict resolved