Fixed the bad commit - working copy
fixed merges