attempt to fix merge branches
attempting to fix our branch situation