Fixed initial commit
Fixing conflicts