Build fix for merge conflict error