fix merge attempt 1