Added --pull option to merge.
Pull latest of merged branch then checkout original branch