Removed Clipboard
Removed Clipboard and resolved conflicts