Merging branches, adding fragment changes.