Final conflict fixes for branch