fixed deleting problem
resolving conflicts