brute force fix merge conflict