Fixed lost changes due to incorrectly merging branches.
Fixed lost changes due to incorrectly merging branches.