This file contains the resolved changes from both the FEATURE and MAIN branches.