Edit stupid GitHub client merge stupidness