test commit with merging