Fix merge errors in EntityItem