Added third line
Merged git conflicts