Fixed merging issues (hopefully)