I have a branch \'master\', this has my backend code, created a new branch \'UI\', which has loads new files master doesn\'t, how do I merge changes in master with the backend c