Merge from master and remote branch