fixing auto merge from github
fixing auto merge from github +1