step 1 and 2
merge github