Update submodule
Update readme
Add more conflict package IDs