pj settings
merge