CHANGELOG conflict

CHANGELOG.md

library/Collections/CollectionOptimisation.cpp

library/FieldUtils/Field.hpp

library/MultiRegions/ContField1D.cpp

library/MultiRegions/ContField1D.h

library/MultiRegions/ContField2D.cpp

library/MultiRegions/ContField2D.h

library/MultiRegions/ContField3D.cpp

library/MultiRegions/ContField3D.h

library/MultiRegions/ContField3DHomogeneous1D.cpp

library/MultiRegions/ContField3DHomogeneous1D.h

library/MultiRegions/ContField3DHomogeneous2D.cpp

library/MultiRegions/ContField3DHomogeneous2D.h

library/MultiRegions/DisContField1D.cpp

library/MultiRegions/DisContField1D.h

library/MultiRegions/DisContField2D.cpp

library/MultiRegions/DisContField2D.h

library/MultiRegions/DisContField3D.cpp

library/MultiRegions/DisContField3D.h

library/MultiRegions/DisContField3DHomogeneous1D.cpp