Resolve composer merge fubar