Nothing will be different
Merge conflict.