file was removed upstream and merged badly