change View -> Files
merge origin