Getting repo up to date with other branches