fix merge conflict thing