Merge cleaup