Fix handler with the correct unconflicted code