I have cloned private git repository, the problem is I have a lot of git conflict markers which are causing my code to fail, for example:
<<<<<<