Trying to correct merging issues