fixing trackview
fixing merge