untracking .pyc file
merge