JAL-2754 corrected merge conflict