add make rules for merging