[WIP]Fix to resolve remotes branch correctly

#76