more changes motherfucker
fix merge conflicts