merge interface branch changes