removing last line from MergeConflict
Merge branch 'master' of https://github.com/colestew/apt14-tcs
...