before merge
merge conflict solved