changes to every file
resolve conflict in Matt.html