increase border with for composer
fix merge conflict