Adding actions
Fixing merge conflicts