resolved changes