Caleb and David plugins
Fixed conflicts