always try and get my PR merged before anyone else
You're viewing a single thread.
Jetbrains IDE is pretty good at solving conflicts.