a new line is added to main.cpp
This is dev commit
This is master commit
fix conflict