one by line makes it a lot easier to uplift and resolve conflicts.