golfing
fixing conflicts