fixed bad merge/conflict resolution.