edits: CONVENTIONS.md git conventions and removed filler lines