Fix merge issue - two lines missing