Removed right panel
Fixed conflict