writing feature identification methods
resolving conflicts