finished everything
merge