Fixed changelog conflicts