Attempt at resolving conflicts

Github Noob Test #1