ok next! you wanna do "add_1", i'll do "align"? they're in different file locations, so git will merge them successfully (as long as we stick to just those areas of the code) l.