merge
fix composerjson