commiting after pull merge 2