fiddled with the merge process