others views
fixed merge