Fixing build issue due to merge conflict