resolved changes
fix