fixing views
del
fixing build version
fixing merge issues