sidebar majic
fixing merges