Resolving merge conflicts in PR#52