renamed namespace conflict container to remove extra border