Resolve Conflicts of Kasun