Trying to fix merge problem