Fix conflicts with darkpsy repo