add codes for testing
merge