resolving merge conflicts

like a bawse