Removed files which were making merge errors
...
Changed acd.cs