Added git conflict remaining files