rebuild after merge
cleanup package
fix paste event
merge