saving changes before merge
solve merge