resolving conflicts
resolved conflicts, separated dec environments