backlift folder commit
adding backlift to assets
resolving merge conflicts/adding files