silly pyc files not merging
always merge conflicts