Resolve Conflict in Master Layout.