Resolving merge conflicts

Yayy my first PR