Fix merge conflict, composer, add migration