fixed conflicts i had forgotten about