cleaning merge with github