Post merge fixes: - Fix phrase conflict - Rebuild manifest