merging changes to local github

using the GUI so merging changes to my directories