Latest with deploy and merge conflicts from design