Now, it runs after the merge