Adding everything
Fixing merge conflict