Resolved conflict with inc/decr mastercount