updating branch with latest changes