Pulling the merge