formatted with bootstrap
merged diffs