ui fixed
conflicts resolved