Git merge conflicts

Development Programming & Scripting
3

i figured this might be the case :frowning: thanks for the response.