gui done
merge