merge and new player assets
merge for real
merge again idk whats happenin