fixed composer
merge conflict