Hover in progress
conflicts resolved