Removing line caused by an error during merge