merging commits, cleaner messaging etc