reset to previous commit
readded plugins that I accidently deleted
fixing conflicts