Commiting staging changes
Change to staging. Added a line
Fixing conflict