I just lost a part of my soul merging git conflicts.