moving to jade with stylus
merge