updating branch to match master