Fix merge conflict
1 file changed