desktop copying
conflict fixed
bug fix