composer.json merge=ours
composer.lock merge=ours
dev/* merge=ours