Re-remove file after merge failure (my fault)
1 file changed