Changes for events, breakpoints, gutters
Resolve merge conflicts
resolve merge conflict, occured When i was resolving previous one