Fixed merge problems with relayoutMask