merge local changes to gitsick