Merged two different versions