Fixing Conflicts

In player2D.
Apologies for all the commits, merging is annoying.