merge to master edit diff