merge work with github