test commit merge resolve