finished filters screen
resolved conflicts
view comments button