conflicts resolved-JP