Fixed changelog conflict