conflict ver 1
more conflict.
Some testing on change indicator
Testing hunks.
[Merge Commit]