added file for conflict
added file
added another file too
changes made to file conflict to inflict conflict xD
changed it here too to inflict conflict xD
resolved confilct
deleted files