renamed panel
renamed panel
Merge branch 'new-branch' into second-branch
private-public
private-protected
Merge branch 'new-branch' into second-branch
removing spare files and folders
generating a conflict
conflict solved