first commit
test commit from qt
resolved conflict