Issue #121 - Edit backend
Issue #121 - Fix conflict