// I think the conflict is that there were no line between the function so it considers yours as a conflict?