Forgot to remove git conflict stuff