- removing trac file again to see if merges play well together