merge code to master first time