Resolved composer conflict