fixing conflicts Sat morning