commit for merge update
merge with cool styling