Bottom panel created
Conflicts resolved