trailing whitespace
composer.lock
fixing base layout