Remove unwanted merge artifact