Fixed errounous merge