Solving merge conflicts takes conscious effort, but I can do it!
I like how version control prevents mistakes from being permanant (for the most part). I do however get frustrated sometimes with the intricacies of solving merge conflicts with very specific differences like spacing, etc.
- Rachel Bouwer