show user completed
conflicts resolved