there are conflits when the files are linking