clean play 2.x app
merge