conflictResolveTest

editted file to resolve conflict