removed local compiled assets
back to normal list
solved merge conflict