first commit
remove pyc and log
change something
merge conflict