Fixing tabs/identation
fixing conflicts