better main
merge