adding code to merge