resolving conflict

take that git!