Trying to make te merging work a little bit