Fix composer after merge with master