Commit for merge by command
Remove comment
Commit for test merge brance
Edit confict code