Jason's merge