merging changed to be reflected online