Merge a fork with original github desktop