Actually take changes from correct branch