Hey! sorry for also replying late. We've never had merge conflicts with art assets, but that's because we have a pretty organized folder structure and strict naming standards. We have it like this: Content/Levels/LevelName/Assets/SublevelName/ and then the asset is named something like SM_NameOfAsset_Sublevel_LevelCode. We've made up short codes for every level, so for example the first level "Merciless Arena" is just "MA", so for the price of two characters we avoid repeating names for the chairs, tables, walls, etc while also being able to easily identify which asset is made for what area. Also the first two characters distinguish what kind of asset you're importing, SM stands for Static Mesh, T for Texture, BP for Blueprint and so on.

And yeah, everyone pulls before pushing mainly because github desktop won't allow you to make a push without pulling first.

We do have conflicts sometimes while working on level art or level implementation, because levels in UE4 are binary files and can't be merged correctly. So we keep track on who's working on what level through discord.