modify conventions and git workflow