working on problem 50
resolving merge