Final merging changes