resolve conflicts with LY's changes