commiting merge string