Prototype: clear fix
Prototype: git conflict resolved