Conflicts: .idea/modules.xml .idea/modules/simple-database.iml very-simple-templates.iml Fix dependencies, new version
# Conflicts: # .idea/misc.xml # simple-database.iml