removed comflicting files