Heavily altered.
resolved conflicts