Deleted folder and merged main