ACTUALLY merged conflicts from hell... maybe