tired: cleaning up commits, rebase and merge
wired: copying files and commit to the main branch