Revert "Merge conflict"