Added solution to problem 1
Fixing conflict