Remove Trunk merge bugs