- [] Merge conflicts - [] Rebase conflicts - [] Push conflicts - [] Pull conflicts - [] Misc. conflicts