Trying to fix merge errors