updates to fix conflict