BZ-99999: Merge conflicts