Removed merge conflicts, probably lost a few things in the scene....