commit before merge
merged changes