This is a different thing
Fixed the issue with the merge