Add a change designed to be in conflict.
Fixed merge conflict