prep for merge-JP