manually merge files from master