Resolving Requirement Conflicts through Non-Functional Decomposition