Summer fixed, merge not fixed