wed afternoon
add conflicts in pyc files