all bugs fixed
merger??
merge fixed