Attempt to fix borken merge