resolve RJ conflict #2