commit the shit
merge?