Fixed reverts.
Fixed revert and merge issues.