fix the merge gone bad stuff here