% Add base view controller and merge last changes