updates
workaround inability to get conflicts in 1 step