grid view complete
conflicts resolved