adding merging code...