Resolve conflict from previous commit, caused (in all likelihood) by GitHub outage