it's -> its
merge fixes