removes tiny merge conflict thing