attempted to correct merge