resolving conflicts from earlier pull
Created views for the station