Test conflict.
Merged conflict manually